merge trunk
authorKenichi Handa <handa@m17n.org>
Tue, 20 Sep 2011 00:54:43 +0000 (09:54 +0900)
committerKenichi Handa <handa@m17n.org>
Tue, 20 Sep 2011 00:54:43 +0000 (09:54 +0900)
commit7508eb806ca72d6174a5f3bbcbe008fe64c63ce3
treea9ededd7e6d9929c8af7e0e6135bd1f12ee4a889
parent029424997ad946add6762eba3c8042383a84579e
parent83cfad91f5953c5b7d1addb515e7e39bad94fa11
merge trunk